Merge branch 'gtk-2-90'
authorMatthias Clasen <mclasen@redhat.com>
Fri, 7 May 2010 02:55:02 +0000 (22:55 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 7 May 2010 02:55:02 +0000 (22:55 -0400)
commit77d4d3cdae0739c0a5643fb23891f8790f05c074
treeebd134deb99ffd0ef47aea63e3dfcea73bd625f5
parentb3e0e25d65db6b7be3385663ceeaecdc5c3115df
parent0de8601327d541f644dc1882c99f44551870a7ab
Merge branch 'gtk-2-90'

Conflicts:
gtk/gtkentry.h
docs/reference/gtk/gtk-sections.txt
gtk/gtk.symbols
gtk/gtkentry.c
gtk/gtkentry.h
gtk/gtklabel.c
gtk/gtktextview.h
gtk/gtktreemodel.h
gtk/gtktreemodelfilter.h